From: Jeroen van der Heijden <jeroen@transceptor.technology>
Date: Fri, 5 Oct 2018 11:13:27 +0000 (+0200)
Subject: Ret code make test and fix siridb test
X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~8^2~35
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=52ebd05645003d38e1fb4854758f0b3a22e99f95;p=siridb-server.git

Ret code make test and fix siridb test
---

diff --git a/Debug/makefile b/Debug/makefile
index c94e604a..84688837 100644
--- a/Debug/makefile
+++ b/Debug/makefile
@@ -81,4 +81,4 @@ clean:
 -include ../makefile.targets
 
 test:
-	-@cd ../test && ./test.sh
\ No newline at end of file
+	@cd ../test && ./test.sh
diff --git a/Release/makefile b/Release/makefile
index 2ece93b4..8769767d 100644
--- a/Release/makefile
+++ b/Release/makefile
@@ -81,4 +81,4 @@ clean:
 -include ../makefile.targets
 
 test:
-	-@cd ../test && ./test.sh
\ No newline at end of file
+	@cd ../test && ./test.sh
diff --git a/test/test_siridb/test_siridb.c b/test/test_siridb/test_siridb.c
index a0d1e517..aa1a1989 100644
--- a/test/test_siridb/test_siridb.c
+++ b/test/test_siridb/test_siridb.c
@@ -6,6 +6,7 @@
 static int test_series_ensure_type(void)
 {
     test_start("siridb (series_ensure_type)");
+    (void) setlocale(LC_NUMERIC, "English_Australia.1252");
 
     siridb_series_t series;
     qp_obj_t qp_obj;
@@ -28,12 +29,14 @@ static int test_series_ensure_type(void)
 
         qp_obj.tp = QP_RAW;
         qp_obj.via.str = "55 percent";
+        qp_obj.len = strlen(qp_obj.via.str);
         siridb_series_ensure_type(&series, &qp_obj);
         _assert (qp_obj.tp == QP_INT64);
         _assert (qp_obj.via.int64 == 55);
 
         qp_obj.tp = QP_RAW;
         qp_obj.via.str = "garbage";
+        qp_obj.len = strlen(qp_obj.via.str);
         siridb_series_ensure_type(&series, &qp_obj);
         _assert (qp_obj.tp == QP_INT64);
         _assert (qp_obj.via.int64 == 0);
@@ -56,13 +59,15 @@ static int test_series_ensure_type(void)
         _assert (qp_obj.via.real == -1.0);
 
         qp_obj.tp = QP_RAW;
-        qp_obj.via.str = "0,5 percent";
+        qp_obj.via.str = "0.5 percent";
+        qp_obj.len = strlen(qp_obj.via.str);
         siridb_series_ensure_type(&series, &qp_obj);
         _assert (qp_obj.tp == QP_DOUBLE);
         _assert (qp_obj.via.real == 0.5);
 
         qp_obj.tp = QP_RAW;
         qp_obj.via.str = "garbage";
+        qp_obj.len = strlen(qp_obj.via.str);
         siridb_series_ensure_type(&series, &qp_obj);
         _assert (qp_obj.tp == QP_DOUBLE);
         _assert (qp_obj.via.real == 0.0);
@@ -92,8 +97,8 @@ static int test_series_ensure_type(void)
         qp_obj.via.real = -1.1;
         siridb_series_ensure_type(&series, &qp_obj);
         _assert (qp_obj.tp == QP_RAW);
-        _assert (strlen("-1,100000") == qp_obj.len);
-        _assert (strncmp("-1,100000", qp_obj.via.str, qp_obj.len) == 0);
+        _assert (strlen("-1.100000") == qp_obj.len);
+        _assert (strncmp("-1.100000", qp_obj.via.str, qp_obj.len) == 0);
 
         qp_obj.tp = QP_INT64;
         qp_obj.via.int64 = -1;
@@ -102,13 +107,13 @@ static int test_series_ensure_type(void)
         _assert (strlen("-1") == qp_obj.len);
         _assert (strncmp("-1", qp_obj.via.str, qp_obj.len) == 0);
     }
-
+    (void) setlocale(LC_ALL, NULL);
     return test_end();
 };
 
 int main()
 {
-    (void) setlocale(LC_ALL, "");
+
 
     return (
         test_series_ensure_type() ||